From ecd961fcf733efc1403a911b21572f1ec1743887 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 13 Jul 2009 08:36:40 -0500 Subject: [PATCH] more directfb updates --- gdk/directfb/gdkdrawable-directfb.c | 26 +++++++++++++++++++ gdk/directfb/gdkmain-directfb.c | 28 +++++++++++---------- gdk/directfb/gdkwindow-directfb.c | 39 +++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 13 deletions(-) diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c index e198881b83..e10f6b11ac 100644 --- a/gdk/directfb/gdkdrawable-directfb.c +++ b/gdk/directfb/gdkdrawable-directfb.c @@ -1600,6 +1600,32 @@ gdk_directfb_cairo_surface_destroy (void *data) impl->cairo_surface = NULL; } +void +_gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface, + int width, + int height) +{ +} + +cairo_surface_t * +_gdk_windowing_create_cairo_surface (GdkDrawable *drawable, + int width, + int height) +{ + GdkDrawableImplDirectFB *impl; + IDirectFB *dfb; + cairo_surface_t *ret; + + impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); + dfb = GDK_DISPLAY_DFB (gdk_drawable_get_display (drawable))->directfb; + + ret = cairo_directfb_surface_create (dfb, impl->surface); + cairo_surface_set_user_data (ret, + &gdk_directfb_cairo_key, drawable, + gdk_directfb_cairo_surface_destroy); + + return ret; +} static cairo_surface_t * gdk_directfb_ref_cairo_surface (GdkDrawable *drawable) diff --git a/gdk/directfb/gdkmain-directfb.c b/gdk/directfb/gdkmain-directfb.c index 0c03208cc4..3c200b6d2f 100644 --- a/gdk/directfb/gdkmain-directfb.c +++ b/gdk/directfb/gdkmain-directfb.c @@ -405,23 +405,25 @@ gdk_keyboard_grab (GdkWindow *window, GdkGrabStatus -gdk_display_pointer_grab (GdkDisplay *display,GdkWindow *window, - gint owner_events, - GdkEventMask event_mask, - GdkWindow *confine_to, - GdkCursor *cursor, - guint32 time) +_gdk_windowing_pointer_grab (GdkWindow *window, + GdkWindow *native, + gboolean owner_events, + GdkEventMask event_mask, + GdkWindow *confine_to, + GdkCursor *cursor, + guint32 time) { g_return_val_if_fail (GDK_IS_WINDOW (window), 0); g_return_val_if_fail (confine_to == NULL || GDK_IS_WINDOW (confine_to), 0); - return gdk_directfb_pointer_grab (window, - owner_events, - event_mask, - confine_to, - cursor, - time, - FALSE); + _gdk_display_add_pointer_grab (_gdk_display, + window, + native, + owner_events, + event_mask, + confine_to, + cursor, + time); } #define __GDK_MAIN_X11_C__ diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index 153dc1823e..7f82a6d083 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -2804,6 +2804,45 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable) D_DEBUG_AT( GDKDFB_Window, " -> depth is still %d\n", impl->paint_depth ); } +GdkRegion * +_gdk_windowing_get_shape_for_mask (GdkBitmap *mask) +{ + return NULL; +} + +GdkRegion * +_gdk_windowing_window_get_shape (GdkWindow *window) +{ + return NULL; +} + +gulong +_gdk_windowing_window_get_next_serial (GdkDisplay *display) +{ + return 0; +} + +GdkRegion * +_gdk_windowing_window_get_input_shape (GdkWindow *window) +{ +} + +void +_gdk_windowing_before_process_all_updates (void) +{ +} + +void +_gdk_windowing_after_process_all_updates (void) +{ +} + +void +_gdk_windowing_window_process_updates_recurse (GdkWindow *window, + GdkRegion *region) +{ + _gdk_window_process_updates_recurse (window, region); +} static void gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface) -- 2.30.2